code 
-----
make code more simple

